ios 10 music

I have just downloaded iOS 10 and have a question about the Apple Music reformatting. I organize my music by artist, and liked that previously, when I select an artist, all of the tracks would be listed under each album so that I could easily choose where to start listening, but after that song, all tracks by the artist could be shuffled. Is there a way to select a specific song, but still have all music by the artist be played next, rather than having only the album that track is on be played?